Document the new policy of bumping version numbers after release.

2004-05-06  Matthias Clasen  <mclasen@redhat.com>

	* docs/RELEASE-HOWTO: Document the new policy of
	bumping version numbers after release.

	* configure.in: Bump version number to 2.5.0.

diff --git a/ChangeLog b/ChangeLog
index 8094da158ab8e7bd9d0a175c0ac42449c70901dc..c7844d5ab7aec8fe52536f929a6b4258f573aa4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * docs/RELEASE-HOWTO: Document the new policy of
+       bumping version numbers after release.
+
+       * configure.in: Bump version number to 2.5.0.
+
 2004-05-06  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * gtk/gtkmenu.h:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8094da158ab8e7bd9d0a175c0ac42449c70901dc..c7844d5ab7aec8fe52536f929a6b4258f573aa4a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * docs/RELEASE-HOWTO: Document the new policy of
+       bumping version numbers after release.
+
+       * configure.in: Bump version number to 2.5.0.
+
 2004-05-06  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * gtk/gtkmenu.h:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8094da158ab8e7bd9d0a175c0ac42449c70901dc..c7844d5ab7aec8fe52536f929a6b4258f573aa4a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * docs/RELEASE-HOWTO: Document the new policy of
+       bumping version numbers after release.
+
+       * configure.in: Bump version number to 2.5.0.
+
 2004-05-06  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * gtk/gtkmenu.h:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8094da158ab8e7bd9d0a175c0ac42449c70901dc..c7844d5ab7aec8fe52536f929a6b4258f573aa4a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-05-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * docs/RELEASE-HOWTO: Document the new policy of
+       bumping version numbers after release.
+
+       * configure.in: Bump version number to 2.5.0.
+
 2004-05-06  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * gtk/gtkmenu.h:

diff --git a/configure.in b/configure.in
index c498554b332a297de62749ee329cb62ac04d3522..6273739d0a8aeeca60164e3f77bcad8c8856e111 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,11 +11,11 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [4])
-m4_define([gtk_micro_version], [1])
+m4_define([gtk_minor_version], [5])
+m4_define([gtk_micro_version], [0])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [1])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 # This is the X.Y used in -lgtk-FOO-X.Y
@@ -1207,6 +1207,17 @@ if test "x$gdktarget" = "xx11"; then
     GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags xcursor` $GDK_EXTRA_CFLAGS"
     GDK_EXTRA_LIBS="`$PKG_CONFIG --libs xcursor` $GDK_EXTRA_LIBS"
   fi
+
+  # Checks for XFixes extension
+  
+  have_xfixes=false
+  PKG_CHECK_MODULES(XFIXES, xfixes, have_xfixes=true, :)
+
+  if $have_xfixes ; then
+    AC_DEFINE(HAVE_XFIXES, 1, Have the XFIXES X extension)
+    GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags xfixes` $GDK_EXTRA_CFLAGS"
+    GDK_EXTRA_LIBS="`$PKG_CONFIG --libs xfixes` $GDK_EXTRA_LIBS"
+  fi
     
   # Xshm checks
 

diff --git a/docs/RELEASE-HOWTO b/docs/RELEASE-HOWTO
index 0f635e2249dbdb8760c96eeca52be61cf58a3e70..34d05e297420c9dfa600418982b292111e2c615b 100644 (file)
--- a/docs/RELEASE-HOWTO
+++ b/docs/RELEASE-HOWTO
@@ -16,8 +16,9 @@ Without those packages make distcheck will *not* pass.
 0) Blow away your gtk+ directory, check a new version out
 1) autogen and build it, make sure to enable docs.
 2) Update NEWS based on the various ChangeLog files
-3) Update version in configure.in, increase micro and interface age by 1.
-(Note that this is critical, a slip-up here will cause the soname to change).
+3) Verify that the version in configure.in has been bumped after the last
+release. (Note that this is critical, a slip-up here will cause the soname 
+to change).
 4) Add === Released 2.x.y === at the top of all ChangeLog files
 5) make distcheck
 6) Fix broken stuff found by 5) repeat
@@ -34,3 +35,4 @@ create a new message in the same form, replacing version numbers, commentary
 at the top about "what this release is about" and the Summary of changes.
 12) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
 gtk-devel-list. Set reply-to to gnome-hackers.
+13) Bump the version number in configure.in.